Pass info more consistently, adapt logging
Authored by: dannybackx 2020-07-25
Parent: [r314]
Child: [r316]