Merge branch 'work.lookups' into for-next