master into ccweaver