(cherry picked from commit 19ff6a7f4b)
19ff6a7f4b
Also delete tmp patch (cherry picked from commit 877b088255)
877b088255