Make a backport branch for SVN-4686. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.10.x-issue4686@1823212 13f79535-47bb-0310-9956-ffa450edef68