resync with data-exchange https://github.com/data-exchange/data-exchange/commit/c64bc7ec72d028cdbdfd2794fbe9d495466cfff0