[T6984] Bugs control ciego

Merged Pablo Ferreira requested to merge T6984 into 17.0

Merge request reports