Merge commit '610ef4c8eb0a9e684ce6c14b390bc62f8b8bfff1' into hotfix/0.8.2
Merge branch 'hotfix/0.8.2'