Merge "Rework thumbnail cleanup" into oc-dr1-dev