Split #1554 into bug fix and debugging info

Allows for cherry-picking the first two commits into 4.5 Closes #1554 by superseding it.

Merge request reports

Loading