Merge branch 'hotfix/failSafeAdapter' into develop
Merge branch 'develop'

* develop: