Merge "Updating the comments as per API feedback"