Cherry-pick commits from #637#966

minghangli-uni merged 1 commit intodev-MC_4km_jra_ryf+regionalpanan+isfACCESS-NRI/access-om3-configs:dev-MC_4km_jra_ryf+regionalpanan+isffrom

cherry_pick_from_pr637_into_dev-MC_4km_jra_ryf+regionalpanan+isfACCESS-NRI/access-om3-configs:cherry_pick_from_pr637_into_dev-MC_4km_jra_ryf+regionalpanan+isfCopy head branch name to clipboard