(cherry picked from commit 3f5066064e5cb01b3df1ff1e4ac5bfdec12a8046) Former-commit-id: c94c6bc341be9ecdec2ff079a51cdc6ba6a269e8