[FIX] [RV-280] code simplified

Merged Arturo Porthe requested to merge RV280 into 12.0-stage

Merge request reports