merge with svn
merge with svn r112, add SecurityGuard control view and implement