Merge branch 'adapt-224' into 'master'

Adapt 224

See merge request !6
2 jobs for master in 13 minutes and 30 seconds (queued for 3 seconds)
latest