Footnotes: Back-ported merge conflict fix in master back to v3.0.