Backporting commits from the c7 repo

[cachescrubber]

Thanks, Julian. I’ll contact you via slack and check your c7-commit-rewrite.