Add changes to fix the catalogue recompiling without adding the new schema changes

When some changes were made to the catalogue-schema submodule, they were added on top of the schema changes for version 13. As the schema upgrade should be a separate procedure we should cherrypick the fix and add it to the tag 12.