Merge: from parallel_validatemove - more debug to track down null baseplayer Tests: local editor SERVER+CLIENT session