Backport Elf changes from d5d0619

a26ab9afeeJakub Konka committed on 1/19/2021, 9:54:34 PMparent0e56d4c
3 files changedLine totals unavailable