develop_satellite_pre-merge

Tagging develop_satellite branch prior to develop -> develop_satellite merge, for easy restoration if necessary.