[Merge] From GR Core