Merge "Revert submission 9940985-qpr1-dev merge" into qt-qpr1-dev