Merge branch '749_loc' into 749-harmonize-ism-metadata-structures