Sync DFR model with changes from jargon (whitespace only).
Not worth review and landing, since it's just whitespace change, but just recording for context on !615 (closed)
Not worth review and landing, since it's just whitespace change, but just recording for context on !615 (closed)