ui-fix-hk
Merge branch 'release/v1.65.0_hk'