(cherry picked from commit 72d48529992a922d0979a6db0cf223d588197dbb)
(cherry picked from commit 5b962fcc42bf92b063d62057b174debfa9c9caa4)