Latest PR of updates.

Latest PR of updates.