Merge "Follow up for a comment from ag/7080956" into qt-dev