Refs #14627; Updated for eea.versions v6.0