Merge branch 'dev' into facade/config