Merge branch 'main' into ci/fix_json_configs_for_OMASA_and_OSBA