Pull request: #1721