comments to watch for upstream merges