6.8.3-checkpoint
Merge branch '6.8.3' into stable