Issue/cb 2451 revert pr 1169