merge and format 3.6 pull request