(cherry picked from commit c1c48e93d50cb0ebbccaf11c3f4a975af640b63a)
(cherry picked from commit 744c8bc8dc8a82cb3afb75aead5a744adaae5501)