Merge branch 'jt/pretend-object-never-come-from-elsewhere'