Merge branch 'v1.0.7-rudzinski' into 'v1.0.8'

V1.0.7 rudzinski

See merge request !625
15 jobs for v1.0.8 in 3 minutes and 53 seconds (queued for 5 seconds)