- apply changes from commit: d9d0f3bee also to rhel-repart