issue #22155: Misc. improvements.
issue #22155: Add more support for item source.