Align with 2.1.0 release