Initial commit for version 2.0.x patch release