Git sync fork

@kevgo please review
Run "echo_error_header" first here