Got in line with the corresponding Core branch.
Logs are non-const in other plugins, so keep it.
Merge branch 'memory-usage-reports'