Bumped to v.2.1.6
Merge branch 'release/2.1.6'
Merge tag '2.1.6' into develop

Bumped to v.2.1.6