I've attempt to fix this issue in #10258.