Merge branch 'development' into 'master'

Development

See merge request !31
12 jobs for continuous