[RHE-629] RHE-629