(cherry picked from commit eb6be0d9d13a0834b6a7ada9aab846cfbbdfd664)
(cherry picked from commit cad5b4d7deba4fbe4a40a17306ce49d3b2f13139)