[RHE-636] RHE-636