Merge branch 'dev'
Fix bug with normalizing path in vdb connection
Merge branch 'master' into dev