Fix client from adding a new entity with every movement
Merge remote-tracking branch 'origin/master'