[RHE-618] RHE-618