merge master into CAS branch