First wave of major defects backported from trunk