Merge branch 'develop' into fix_fastica

2 jobs from fix_fastica in 6 minutes and 7 seconds (queued for 4 seconds)
merge request
Status Job ID Name Coverage
  Build
passed #748
native-build

00:06:07

passed #749
shark-build

00:05:38