Merge pull request #1154 from bendiy/21224