Feat/v4 compat

Julien Nyczrequested to merge
feat/v4-compat into master

Merge request reports