Merged in recent changes to v1.60 in prep for meld