[T4485] bug fixes.

Merged Joel Maglioni requested to merge T4485 into 15.0-stage

Merge request reports