(cherry picked from commit 8498d287cd3beddcf8fe19625227e09982ec4be2) (cherry picked from commit 0e73efb1ad68398ce5f7cde51466cea8c2153659)