merge fixes to master from develop