svn: r12605 original commit: 2207df048dad5172c8f76fc43942722e1c4cb817
svn: r10708 original commit: 1858924c508d27211f98a52045b33a80e71cef44