First wave of major defect fixes backported from trunk