Pull request for ticket #21063