case 3339 - Differenciate between local and remote manifestations.
Merge branch 'case-3339' into new-search