add back merged out bug fix
Merge branch 'hotfix/1.8.1'