issue #19550: Handle effectivity