UPDATE: Report design+extension
Merge branch 'master' into marijn-dev