Cherry-pick commits from #535#541

blimlim merged 1 commit intodev-1pctCO2-bgcACCESS-NRI/access-esm1.6-configs:dev-1pctCO2-bgcfrom

cherry_pick_from_pr535_into_dev-1pctCO2-bgcACCESS-NRI/access-esm1.6-configs:cherry_pick_from_pr535_into_dev-1pctCO2-bgcCopy head branch name to clipboard