[REV][LR-121] Revert commits

Merged Gabriela Valdez requested to merge 12.0-Revert-LR121 into 12.0-stage

Merge request reports