re-fix Bug ZK-1711
Merge remote-tracking branch 'VincentJian/B65-ZK-1711'