Merge "Rephrase code to avoid overflow" into qt-qpr1-dev