Merge DressUp changes from 4.1 into 4.1-dev