AF5 is indexing the metadata format differently, make registrations check both
Merge branch 'develop'