[RHE-614] RHE-614