[RHE-482] RHE-482