last changes refs #2498