(cherry picked from commit 9448b497ed6b80e41f0e9f731f1ffa1e56fb149a)
(cherry picked from commit c8eb1bc481347efb6d35e9122e17e624bde18772)