fix activity report when filtering on custom fields
Merge branch 'dev' into test
Merge branch 'test' into prod