Resubmission of pull request #1779