Merge "Remove use of --check-compatibility:base" into main