[GH-9] Update core files changed upstream

Changes between original extraction and fog/fog@e759687e0

For [GH-9]