(cherry picked from commit fdaef0a5a4ad097f3f693aad4f21230288f6a484)
(cherry picked from commit bddff9d0ac94a2f77477d9c36d1231a5997153f3)