Merge "Add handling for inherited stress attributes"