fix no role to move problem
Merge remote-tracking branch 'origin/master'