Re-rolled the final commit in #2059597 for our version of dfp Case 19815; second try, different filename