1.61 merge pull request issue 31