Refs #18277 EEA; Fixed version