cookie issue as well as all portfolios view
Merge completed