Patched uuid_features and webform to ensure uuid-based webform behaviour