Remove the 'move_type' default value settting
Merge remote-tracking branch 'remotes/origin/master' into Develop