[RHE-612] RHE-612