6.8.2-checkpoint
Merge branch '6.8.2' into stable