Merged master (with events -> legacy-events package rename)