merge 2.0 to master

Fixes from scrutinizer