Bleeding edge freeze

Merged master in.

Fixed #2913