Merge staging release 2.1.0 with master
removed kink
Commit VERSION 2.1.0
Merge branch 'staging'
Merge staging release 2.1.0 with master