Addressing 2.0 tool failure #33
Merge branch 'dev' into ms