(cherry picked from commit 42a7aec0b51c4c9f0d2588972a3fddfd3bd2f981)
(cherry picked from commit f16ea74abe4973faf1cd7d6a056a1074fa1e817f)