Refs #6445 - Foreman update