Allow tenant switch without the loss of my content

Setup
=====
We use a multi-tenant environment for different customers with the same database.
There are some special customers (service provider), they have access for more than one tenant (but not for all).
For this purpose we are using a customized tenant mapper, based on the AD, but with the possibility to overwrite the tenant assignment.
So this special customers can change their user-tenant mapping by there self.

Problem
=======
Every time a tenant switch is done, all "my content"-elements by the user is deleted (this includes also the schedules and subscriptions).

Statement of the product manager (Greg McDonald), when we want to add this problem as a bug:
"This is by design. It is imperitive that all tenanted content is 100% segragated therefore, if I am tenant1\greg and then the ldap admin assigns me to a different tenant, I should not see tenant1\greg content any longer as I am not part of tenant 1 anymore.

That may be true, but IMHO a full deletion of users "my content" is not necessary. It's enough, if only the current tenant is shown.

Solution
========
Change or add an option to avoid the deletion of all "my content" stuff if a user has a new tenant.
Be sure, that only the data of the current tenant is displayed (also in "my content").

Same problem from community.watsonanalytics.com:
https://community.watsonanalytics.com/discussions/questions/34243/switch-users-tenant-leads-to-empty-mycontent-and.html

We need this, because we're using the tenant switch already and had to implement the described functionality. In Cognos 10 we haven't used tenants, so this was possible, but the permissions were much more complicated.