merge from sae svn repo