Merge branch 'dev' of gitlab.erc.monash.edu.au:hpc-team/strudelv2_spa into gerp

2 jobs for dev in 5 minutes and 8 seconds (queued for 1 second)