Release 2.1.0
Merge branch 'release/v2_1_0' into dev