Merge "Send mapper events via context"