Incorporate changes for v2.1.0 release