(cherry picked from commit 1420c20e57789648fc3383ca57dc85f385470490)
(cherry picked from commit a571a2c040370c319fdb37aba987272be7663bb0)