Resolve #3450120 "Make consistent"

Scott Euserrequested to merge
issue/footnotes-3450120:3450120-make-consistent into 4.0.x

Closes #3450120

Merge request reports