(cherry picked from commit e536c225628e8d32f928c74492894b02fb183df0)
(cherry picked from commit 93c634a471864905d124ae364e2356679ee6410d)