Fixes #3723 : do the update of promises only in the failsafe
Merge pull request #148 from ncharles/ust_3722/dev/3723_do_update_of_promises_only_with_failsafe

Fixes #3723 : do the update of promises only in the failsafe