Interim commit - svn 344