merging v2.1.0 branch