This branch will resolve the bug 7635.