(cherry picked from commit a284c493b127fbf785fbee401f0854ad1979eb26) (cherry picked from commit aa36c3f6b69ef47b6f53158eda4a87e1a72e4fad)