Merge branch 'F5695-Multiform' into 'master'

F5695 multiform

See merge request !186
3 jobs for master in 2 minutes and 35 seconds (queued for 3 seconds)