Merge "Improve overflow handling" into main