fixes for munit
Merge branch 'develop'