Update with latest SD style changes
merge