cherry-picks ~130323