MIS-280 Update in 1-2

git-svn-id: https://svn.gruden.com/users/wenjie/svn2git/branches/1-2@109847 06c7d641-8d64-6d4f-b503-90fe54047782