Merginig pull request https://github.com/eXist-db/exist/pull/407