[[ Bug 13109 ]] Added comments