[[ Bugfix 12523]] Added bugfix note and comments for bug 12523