Freeze 24.7

Freeze 24.7