failsafe
Merge branch 'hotfix/failsafe'
Merge tag 'failsafe' into develop

failsafe fix