Merge branch 'hotfix/0.157'
Merge branch 'release/0.158'