[[ Bug 12864 ]] Integrated from SVN.