Merge branch 'develop' into cdm_new_for_merge

Conflicts:
doc/data_descriptors.md
doc/resource_descriptors.md