Merge branch 'FUP' into 'master'

FUP updates

See merge request !427
3 jobs for master in 4 minutes and 3 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Quality
passed #11278
code-quality

00:00:36

 
  Tests
passed #11279
make-test

00:02:17

55.2%
 
  Install
passed #11280
make-install

00:01:09