Update to SVN revision 1693
Some amends after svn update