(cherry picked from commit 30db137f7ebc504a7d2ebad08bcb37a059d1d6a4)
(cherry picked from commit 1186aab2a45cadeee1f82c8549d9e2bc59710caa)