Bleeding edge freeze update with master