Pick-to: 6.5 Change-Id: I4f58544cac439f2ad768032e3d54d5ab51fe0755 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>