scnd change code1
Merge branch 'master' into newB