Merge "Cap duration to avoid overflow" into main