Commit 2.6.8