Revert "[Merge] From GR-Core"

This reverts commit c83410cea2fd3c40520bc7446241f90bec461bb0.