commented out the uuid_features dev branch override