Revert "Revert "test""

This reverts commit 9ba4ffc3060b6ff531fb8a08f66185e857c456e8.
Michael
Merge remote-tracking branch 'origin/jonas'
Merge branch 'CAM'