Merge "Use date difference to remove the expired data" into main