Update with the latest commits in CSLA