Don't have issues with merging this one as is and address that all both on Katello and Foreman side at once