Merge branch 'cardinal-update-5-10' into 'cardinal'

Cardinal update 5-10

See merge request !4
8 jobs for cardinal in 8 minutes and 55 seconds (queued for 3 seconds)
latest