Merge "Test updates for I044ac25a19ba5b7fd0ee470ca0a13dc65cbd2679" into qt-dev