merge fixes from develop branch to master branch