Merge comments and newly added commented out options from upstream.