Correction for fix #4245: allow null uris
Merge branch 'release' into upstream