upstream_D17894.diff
