Merge branch 'bullseye' into 'master'

Bullseye Compatibility

See merge request !15
1 job for master in 36 seconds (queued for 5 seconds)