7.26 merge