Merge branch 'its9947' into 'master'

ITS#9947 Fix race in epoch.c and simplify

See merge request !581
3 jobs for !581 with its9947 into master in 34 minutes and 40 seconds (queued for 30 minutes and 31 seconds)
latest