issue #19045: Fix state and other duplicate check problems.