8/19-9/6 merge