Minor debug updates to current Rich/RichRecTools

Keep future and master in sync

Merge request reports

Loading