(cherry picked from commit 86ae43bc23afb68dc6c6b13b147e4e64a2d34077)
(cherry picked from commit fe3edac4ef60ea93e78641807015438778afc83c)