(cherry picked from commit 273d154e1640bae26b7caedddf1685e9ff21ab74)
(cherry picked from commit d87917f8f6eb9d2e144a9f840d6d91767ea2eb69)