Merge "Add the lookup_key column, which should have been in the previous CL"