merge develop -D org -I include -E exclude: PR 525 (cpp: replace usage of removed MetadataTools methods)