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