(cherry picked from commit 94b8cea7bb6fea37f3a5c20fb97eadc5828e1272)
(cherry picked from commit 5300ff763bb008699b35dc6e219b50ac1c4fd7af)