update to reflect new changes to uuid_features module and reapply patch