11/28 merge