Update from SVN-1 - external review

Done in parts to help GIT