Qual: Missing include
Bidirectionnal modifications/deletions between task and events
Merge branch 'events' into qe