[[ Bug 10966 ]] Added note.
Merge branch 'bugfix-10966' into develop