Merge remote-tracking branch 'origin/spikes/koen' into kjvdh/features/testing