fix 1588
release-note: add to ZK-1588
fix 1588
Merge branch 'B65-ZK-1588' of git://github.com/huangnoah/zk