[RHE-477] RHE-477