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

Merge from ReForm

See merge request !26
6 jobs for master in 11 minutes and 54 seconds