Pick-to: 6.5 6.7 6.8 Change-Id: I71a518576c1ef0677855561edbd2dc5560727c35 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>