Refs #17453; Updated metadata.xml and upgrades