Merge pull request #15261 from JKingsnorth/report-paths-not-public