Minor comment change
Merge changes