Merge "Snap for 5652689 from 8f9e0717276781d37d5ad4756544d7d64f4ad05e to qt-c2f2-release" into qt-c2f2-release