Merge changes from csete