Minor comment update
Manual merge