Triggered by 6778b247. Pick-to: 6.0 6.1 5.15 Change-Id: Ic8e7136cd82eb8d3891450cfa8994f43b7cc09fc Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
6778b247