[[ Bugfix 13063 ]] Added comments