Merge "Catch temp container thumbnails in cleanup script"