(cherry picked from commit ebc4856b8dce5c1f99274e6b5c23bfba5e012331)
(cherry picked from commit 02b73236a4ca04cbfadba917ebb923f5492c5c6d)