Merge "Add a parameter to allow EventFlag configuration."