Sync with upstream

[slesaad]

Description

https://github.com/NASA-AMMOS/MMGIS has new changes since we last synced.
Now that we've pushed new changes to the fork, syncing isn't as easy as clicking a button.

AC

• Fork up to date with the latest changes from upstream