Merge branch 'release/2.8.2' into production
Merge tag 'v2.8.2'

2.8.2