Merge branch 'master' into 'master'

Continuation change, extract_proph_winner change

See merge request !26
1 job for master in 6 minutes and 21 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #36717
fp-timing
build-coq.8.9.0

00:06:21