Merge branch '1197-race-condition' into 'devel_14.0.x'

Resolve "MINERVANET - Error Report 181"

See merge request !1098
32 jobs for devel_14.0.x in 15 minutes and 35 seconds (queued for 3 minutes and 33 seconds)