Cherry-pick commits from #535#543

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

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