Merge down from CSLA