PLA-546 fix for click tracking
Merge remote-tracking branch 'origin/PLA-546' into PLA-546