Resolves: RHEL-30459, RHEL-33284, RHEL-36420, RHEL-42408, RHEL-43552, RHEL-45230, RHEL-47786, RHEL-49548