[RHE-627] RHE-627