[RHE-617] RHE-617