Merge "Increase string limits" into qt-dev