Merge "Maintenance for ConfirmEdit extension."