+ Fix regressions by merge of draw style branch