Merge #1307 into branch-3.8.14.1