Merge "Update string char limit"