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)