[RHE-637] RHE-637