svn: r12920 original commit: ec600c59bb9caa15f10fb68844677e56a4ce86dc
svn: r12919 original commit: 424ec50bfb3b755103b0516c4a0e69d40ed67811
svn: r12202 original commit: 9851b3ab783dd81cbf7989f813563874e79a8b02