[[ Bug 11006 ]] Added release note.
Merge branch 'bugfix-11006' into release-6.1.0