Upstreammerge

bringing in 0.64 beta changes