Cherry-pick commits from #535#537

blimlim merged 1 commit intodev-historical+concentrations+CNACCESS-NRI/access-esm1.6-configs:dev-historical+concentrations+CNfrom

cherry_pick_from_pr535_into_dev-historical+concentrations+CNACCESS-NRI/access-esm1.6-configs:cherry_pick_from_pr535_into_dev-historical+concentrations+CNCopy head branch name to clipboard