Merge branch 'suggest-v3.x' into uuid, without merging uuid removal mods