Feature/richards on next

Merged Katharina Heck requested to merge feature/richards-on-next into next

Merge request reports