Updated for version 2.6

Change-Id: I16d6bf4c211a4824091454bd202d358a181f9b21
Merge "Updated for version 2.6"