Merge with changes for foreman 1.2