v1.6.5
94582910 · Merge pull request #12806 from muxi/backport-12340 ·