pull request 1_7 37