v9.0.1678
9fcde941 · Merge pull request #12740 from k-takata/import-9.0.1678 ·