Merge branch 'post1.5.1/p4'