Merge "Refactored EventMask to EventFlag" into main