Comment From: hazendaz

@nothingzhl @kazuki43zoo Closing this PR as the change is now on master separately.

Comment From: hazendaz

See cd4a0c2f5e