Include 2.6 fix to foreman