Bug 23126 - Update to 2.0 version

Summary: Update to 2.0 version