(cherry picked from commit 443196f84d07638ff8dc668e08296d0c8cd4905b)
(cherry picked from commit 003d56781178bbd34689081b4ccafa50a8b18353)