Update to SVN 9927
Modified code/model/ to fix Coverity issues