[RHE-481] RHE-481