[RHE-479] RHE-479