Resolve "Polymorphy in Archive queries"

Merged Theodore Chang requested to merge 1432-polymorphy-in-archive-queries into develop

Merge request reports