Copied changes from remotes/murphymc/no_early_events