Merge "Fix Integer overflow in estimateCuesSize" into main