20141126 follow official commit 8c63c9