Cherry picking change to master
Updating some comments