Issue/cb 2454 minimal fixes