[[ Bug 12249 ]] Ensure that players are buffered in edit tool mode, and that they are updated when the tool changes.
Merge branch 'bugfix-12249' into develop