Merge branch 'upcomingMaintenance' of gitlab.erc.monash.edu.au:hpc-team/HPCasCode into upcomingMaintenance