update for feature ZK-2237