case 3020 - Permalink popups conflicts.
Merge branch 'case-3020' into new-search

* case-3020:
  case 3020 - Permalink popups conflicts.