After v1.6.0 is released, port fixes and features to the v2.0.0 `develop2` branch.
After v1.6.0 is released, port fixes and features to the v2.0.0
develop2branch.