v82-stability-hotfix
