[RHE-476] RHE-476