
(cherry picked from commit 80917d2473d321d7a990cf991c6353547976638c) Originally merged #11808 to release-15.09 directly. Close #11821.
(cherry picked from commit 80917d2473d321d7a990cf991c6353547976638c) Originally merged #11808 to release-15.09 directly. Close #11821.