Git sync fork

@kevgo please review
on a feature branch with upstream commit