Swat.
Merge branch 'master' into wip
issue #22155: Fix item source def for discovery.
issue #22155: Fixes so tests will pass again.