Merge "Remove direct field access from event payload" into lmp-dev