Commit 2.8.p beta 1