Merge improvements by Tony Bargnesi: