Merge "Fixing cleanup job"