Merge "Solve compiler warning related to string size"