Bleeding edge freeze

Forgot to pull latest from BEF