Merge "Snap for 5652499 from 9f145111369e0fe88b559be920934bd9e1e7a904 to qt-release" into qt-release