(cherry picked from commit d2700ab7ebb13cc948a7cbacbd336a04b2f2bc93)
(cherry picked from commit 295c3caa684bf5c4279e3219a961b96498c01373)