Merge branch 'merge-from-ReForm' into 'master'

Merge from re form

See merge request !19
7 jobs for master in 9 minutes and 10 seconds