Merge "Snap for 5652499 from 607611e01692e66287d8a7ba58ef3182fa3e1d28 to qt-release" into qt-release