Cook merge (8/25)

Cook merge