Re #8334. Redhat is still unhappy.
Merge branch 'feature/8334_icp_event_log_changes' into develop