[RHE-609] RHE-609