fec-1822 (related click)
fec-1822 - adjusting to generic entry object instead to just the enrty id
whitespace
Merge remote-tracking branch 'origin/fec-1822' into 2.17-Aug-31