Merge "Update string lengths, fix for bug 5732776"