Merge From GR-Core