merge
Add BugTest
Merge branch 'iobe-issue' into shmaster