Merge branch 'jt/has_object'