Hmm... how to fix RelatedManager is not iterable??
Merge branch 'metadata_template_enhancement_code' into metadata_template_enhancement