merge changes from ext_ds