26871 and 26872 updated