Merge branch 'nightly' into 'fix_powerspace'

Nightly

See merge request !196
4 jobs for fix_powerspace in 61 minutes (queued for 6 minutes and 49 seconds)