issue #22067: uuid bugfix