Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next