merge fixes from develop branch