CB-2596: Additional comments