(cherry picked from commit 8d9c8d3ee8ea519e683d5a7cbb5b080d2f78e292)
(cherry picked from commit 5cfda1d92f38da9e5e4fab1413e6e52229a51639)