some merge fixes per comments on r53282