[Merge] Merge from GR-Core Master