Merge branch 'release/stable-25.0-manganese' into 'master'

Follow up on !155

See merge request !156
2 jobs for master in 1 minute and 57 seconds (queued for 2 seconds)