(cherry picked from commit 2035a230)
Signed-off-by: Soomin Lee <bubu@mikan.io>