Pick-to: 6.9 6.8 Change-Id: Id915ecbf218d419b972ff97637673827facf84a2 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>