Merge "Fix Common Event Header fields validation"