Pull request for Trac ticket #21056