[[ Bugfix 12523]] Added bugfix note and comments for bug 12523
Merge remote-tracking branch 'panos/bugfix-12523_notes' into develop