Merge "Fixes breaking test" into qt-r1-dev