build plugin && fix commands
merge from feature