Added patch to allow for conditional_fields feature rebuild and render alter

## Ready State: Yes