[T3499] Fix data ref to ibb situation

Merged Macarena Meldi requested to merge T3499 into 15.0-preStable

Merge request reports