Merge branch 'fix/N+1_problem' into 'develop'
Fixed N+1 problem when fetching catalog
See merge request aswi/aswi-2022/aswi2022code-of-duty!13
Merge branch 'fix/N+1_problem' into 'develop'
Fixed N+1 problem when fetching catalog
See merge request aswi/aswi-2022/aswi2022code-of-duty!13