Merge 2.0 into 2.1

Merging 2.0 new features into 2.1