Issue #3573010: Fix "reset if untriggered" option

Odenrequested to merge
issue/conditional_fields-3573010:3573010-reset-the-target into 4.x

Closes #3573010

Merge request reports