Merge branch 'ci-changes' into 'v0.9.9'

Fix submodule sync issues. #464

See merge request !234
11 jobs for v0.9.9 in 1 minute and 47 seconds (queued for 2 seconds)