Port fix from pre-split achem#2

mathomp4 merged 3 commits intodevelopGEOS-ESM/ACHEM:developfrom

feature/sdrabenh/gcm_v12GEOS-ESM/ACHEM:feature/sdrabenh/gcm_v12Copy head branch name to clipboard