[[ Bug 11069 ]] ContentProvider system updated to allow several application - each needs its own content provider
Merge remote-tracking branch 'origin/bugfix-11069' into release-6.5.3
Merge branch 'release-6.5.3' into develop