0.40 preparation, support for config in create connection etc.
Merge branch 'master' into dev