ConfirmEdit changes for r50218