One more try to fix RelatedManager, going to link_type__in
Merge branch 'metadata_template_enhancement_code' into metadata_template_enhancement