Merge "Snap for 5652499 from e6fe6b65e81d9927f8e5b978b4f82a14cbfc335c to qt-release" into qt-release