Merge branch 'FUP' into 'master'

Added FUP support

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

00:00:33

 
  Tests
passed #11254
make-test

00:02:14

55.2%
 
  Install
passed #11255
make-install

00:01:14