merge fixes from master branch