[FIX][T4657] Refactored code

Merged Hermes requested to merge T4657 into 12.0-stage

Merge request reports