p6697v3

Dan Guest

@dguest

8ee70f9f · Merge branch 'revive' into 'master' · Oct 21, 2025

More issues with metadata in old AOD, hopefully this one works better