Skip to content

Backport #18753 and #19962 to 2.9.x#20522

Open
yangzai wants to merge 2 commits intodigital-asset:release/2.9.xfrom yangzai:hy-map-2.9.x