Merge branch 'schema_tags' into schema-adaptation
register relevant adapter to the just generated schema
Merge branch 'schema-adaptation' into master-qg