Fix: Removed analytics tags
Merge remote-tracking branch 'origin/3.3' into 3.4