Merge "Update the comments to reflect the current status."