Merge branch 'OCF64-rel17-to-rel18' into 'staging'

Ocf64 rel17 to rel18

See merge request !66
7 jobs for OCF79-prepare-code-for-hackfest
in 3 minutes and 8 seconds, using 0 compute credits, and was queued for 1 second