Last changes

Govert de Gansrequested to merge
bep/2019-2020-q4/tam2/tam:final-branch into dev

We should be all set after this one :)

Merge request reports