Merge "merge-ncar4.3.1-into-main" into "main" (had to use intermediary branch to handle conflicts from "main_ncar")
Merging all the NCAR v4.3.1 updates into main to bring it up-to-date from v4.2.1.
Merging all the NCAR v4.3.1 updates into main to bring it up-to-date from v4.2.1.