Merge "Fix some failed tests" into qt-dev