This commit was manufactured by cvs2svn to create branch 'RC_1_32_0'.
move TODO into comments
commented out undocumented additions