merge ZK-2181 fixed into ZK 6.5.x version