Add time dilation error compensation to Actor update
Fix merge conflicts
Fix bad merge
Merge branch 'feature-control' into test-control