include changes from r39286