Cherry-pick commits from #535#536

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

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