Fixes #14979 Closes gh-1560 (cherry picked from commit 1ca84214) Conflicts: AUTHORS.txt
Attach a file by drag & drop or click to upload
