Align with 2.0.0 release and latest development version