Rebase SVN trunk r1797