Cleanup
replay_allowed shouldn't be nullable
Merge branch 'master' into broadcast