Commit 2.8.r unstable beta 4