Cherry-pick commits from #535#540

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

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