2.8.2
Sync with upstream
Back to dev version