[RHE-619] RHE-619