Removed from this release
Merge branch 'dev'