refine B65-ZK-2428
Merge remote-tracking branch 'upstream/6.5'