use blockingwaitstrategy as default in config too
Merge branch 'develop' into otter