[[ Bug 13710 ]] Added comments and bugfix note