Merge "Added TYPE_DATASETS_SHOWN event to FillEventHistory"