Merge "Add event gap verification to defaults"