Fix ZK-1840
Fix ZK-1840: fine tune