[GH-9] Update core files changed upstream