Quick hotfix solving project supports isolation

To backport to the prod server asap