(cherry picked from commit a45d954c721ce732a6de805cc8842f6200e142fa)
(cherry picked from commit 48cc11d7c911cf2bdd3c73d19e42775184eb135b)