failsafe
Merge branch 'hotfix/failsafe'