Issue #2379445 by djdevin: Move property info to metadata controllers