fix concat of engine paths
merge branch 'master' into adaptors