Merge "Snap for 5652667 from 431e40b883a61d93b7d56e6889d770018a2812f2 to qt-qpr1-release" into qt-qpr1-release