Merge 28-yelp-tools.patch