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