This fixes many bugs, and was proposed by Thomas Heller.
Original log message:
'''
Checkin updated version of patch #103933 .  As Thomas says, fixes the bugs
#131064, #129584, #127722. See the discussion in bug #131064
'''