Commit f6d7ea69 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'v1.0.3_cherrypicking_2' into 'v1.0-stable'

v1.0.3 cherrypicking part 2

See merge request !283
parents 52b416a3 6b261d7f
Pipeline #1552035 passed with stages
in 22 minutes and 12 seconds