Dev 2.1.0

Merging changes from dev 2.1.0 to Master