Merged changes from SVN up to rev 1794