Added support for version 2.0.x on branch 2-0-stable