Merge "Fix "Solve compiler warning related to string size""