Re #7945. Changing from fdim to std::fdim.
Merge branch 'feature/7945_check_events_match' into develop