refix B65-ZK-2379 for ZK Bind issue
Merge remote-tracking branch 'upstream/6.5'
Fine tune for B65-ZK-2379
Merge remote-tracking branch 'upstream/6.5'