[WIP] Add additional logging
#1569

jseppi wants to merge additional-logging into develop

We do not currently have an analysis of these two commits