Cook merge (7/25)

Cook merge