When USER_GRANTS is disabled, aka login as dba user, force table liste to be checked against DBA_SEGMENTS with SEGMENT_TYPE of type table or table partition. This could help solving some incomprehensible object found in ALL_TABLES.
Fix merge conflict.