UUID is only generated when inserting, not on update
Merge branch 'hotfix/1.25.2'