TEZ-1290. Make graduation related changes. (hitesh)