[Merge] From GR-Core