updates from doing the FF26 merge day