Git sync fork

@kevgo please review
Do we have variable name collisions here?