variable fixing for entity motion
Merge remote-tracking branch 'public/master'