Cherry-pick commits from #670#673

blimlim merged 1 commit intodev-historical+emissionsACCESS-NRI/access-esm1.6-configs:dev-historical+emissionsfrom

cherry_pick_from_pr670_into_dev-historical+emissionsACCESS-NRI/access-esm1.6-configs:cherry_pick_from_pr670_into_dev-historical+emissionsCopy head branch name to clipboard