pull request 1_8 38