(cherry picked from commit 5b865ecd) (cherry picked from commit 973e1f45c4161d5c3bb80c20ebc60fd88bd4365d)