Merge "DO NOT MERGE" into qt-qpr1-dev