Merge "Add check for action in consumeEvent"