[[ Bug 11001 ]] Reverted fix to bug 10975 since it is not correctly taking into account URL references.
Merge branch 'bugfix-11001' into release-6.1.0