[Merged] Merge from GR-Core Master