SAK-26570 - Merge from trunk NPE from PDA portal web content tool URLs