Resync with theforeman's github