Merge "Fix tests failures" into qt-dev