(cherry picked from commit be96c181debd8841b633f6a15824c60ca5c7a63c) (cherry picked from commit 25752460c36c771de6fdcd147233c55092b24321)