fix the button on P0 bug
Merge branch 'devel'