Merge branch 'work.misc' into work.lookup