[BACKLOG-872] Fixes due to the introduction of the Property type in
metadata.