Update with latest updates from 52North/SOS develop