Merge "Fix composer@2.3 VTS tests." into qt-dev