Merge "Manual revert of ag/6502936" into qt-dev