WP-2407: add ds patch to make.