Merge branch 'adapt-224' into 'master'

Adapt 224

See merge request !6
2 jobs for master in 12 minutes and 58 seconds (queued for 12 minutes and 26 seconds)