[WIP] JA refactor

Merge request reports

Loading