[#72205292] added handling of some _EB overrides