(cherry picked from commit e4e72db5f9f305b493138ab36f073fe5d1750ad8) (cherry picked from commit 4c2b20ca3e98d5f63e29d734595d693ad3a20529)