pull request 1_6 36