fix: [Nightly26.0a1] follow Bug 821687
ver.1.7.11