Adding Vineels changes

Had to manually resolve conflicts.