[Merged] From GR-Core