Completed feature-2
Updated release
Merge branch 'release/2.1.x'