Merge pull request #1438 from bendiy/23537