Cherry-pick commits from #535#548

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

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