Merge "Fix CTS extension errors"