(cherry picked from commit fce5c228675796113c1b00b4a0b399ace2878210) (cherry picked from commit 7f40457b)