Merge tag 'v0.8.2'