[RHE-608] RHE-608