Fix empty cbu

Merged Santiago Said requested to merge fixEmptyCBU into 8.0

Merge request reports