feat: including RGRE changes

dependency: none
Signed-off-by: Joseph Kalandarishvili <[email protected]>

Author: jkalandaibm