Address comments on r217622