More updates to support 2.1.0 release.