[RHE-616] RHE-616