merging dev for new release v1.11.0
check for right branch and symlinks
Merge branch 'dev'
merging dev for new release v1.11.1