recover changes before 9.4 merge