Cherry-pick commits from #535#539

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

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