SVN Revision No. 6408