Rebase SVN-trunk 1727