Merge branch 'integrate_tomwer' into 'master'

Integrate tomwer

See merge request !4
4 jobs for master in 1 minute and 14 seconds (queued for 1 second)