(cherry picked from commit 6933b0986d530e3f5ccaeda33fc1884e9d7a7446)
(cherry picked from commit 690fcf59e43bfeb3a5ba8b5f46ac719f9358c1f1)