Git sync fork

@kevgo please review
What debug statement?