refs #4452, #4453 - modernise and update for EL7