merge latest changes from dswarm