20141212 commit 4.0