Foreman 1.5 rebase