Refs #6849. Use pointer instead.
Merge branch 'feature/6849_MD_metadata' into develop