Issue/cb 2379 part 1 of 3