Refs #18288 EEA; Date formatting changes