[IMP] Improve code

Merged Jose Luis Zanotti requested to merge 12.0-MoveExporter into 12.0-production

Merge request reports