Merge branch 'jk/fast-export-object-lookup' into next