[FIX][RR-391] Fixed the errors marked in the task

Merged Matias requested to merge RR-391 into 12.0-stage

Closes RR-391

Merge request reports