[ADD][T4657] Refactorized the whole module

Merged Hermes requested to merge T4657 into 12.0-stage

Merge request reports