commit 6.8.0