This is the tracking bug for blockers of the 7.0.1 release.
Can we merge r343212 (bugs 33153 and 38073) into 7.0.1?
Don't add comments to this bug; if you want to request a cherry-pick, file a new bug blocking this bug.