Merge branch 'develop-enhancements' into RainFARM_nojulia

1 job for RainFARM_nojulia
in 3 minutes and 50 seconds, using 0 compute credits, and was queued for 3 minutes and 18 seconds