Merged 'Gaps for overlapping events added' commit from origin.