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

* develop:
happy sonar better benchmark