Pulled in 0.34-0.35 Changes