finally solved the BasketContext problem

Nico Vermaasrequested to merge
dev-nico into master

(make sure components are only wrapped once by it)

Merge request reports