squash merge Co-authored-by: Forrest Burt <fburt@ciq.co> Co-committed-by: Forrest Burt <fburt@ciq.co>