Merge branch 'dev-anne' into 'master'

[cafe] video fpga

See merge request !907
2 jobs for master in 1 minute and 50 seconds (queued for 3 seconds)