update develop

merge fixes from ext_ds