Bug fixes in Test V1.2

Bug fixes in Test V1.2
Commit

commi
Merge remote-tracking branch 'origin/1.1bug_fixes'