OGM-175 Use a delegate approach for flush based event listeners