Merge "Resupport long compare"