oops
Merge branch 'hotfix/7.0.6'