Merge "Add support for dpads." into nyc-dev