Supersedes #28971. Co-authored-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit f3b8fe47b0)
f3b8fe47b0