Merge Feature/reporter

Merge Feature/reporter branch into the develop branch
Replace by `"target="`