Merge "Fixing CTS regression"