(cherry picked from commit 17b966e7f1a7485dfe91833efaf34e2a7da26e27)
(cherry picked from commit 01f4bf9aa8e0535b643f5e0638be174d5dc769db)