Merge "Get rid of a TODO to add documentation for now-hidden columns"