issue #22155: Partial progress adding dual support for item source and vendor item number in the same widget.
issue #22155: swat.
issue #22155: Misc fixes.