Merge remote-tracking branch 'upstream/master' into fix/giddy-giraffe-analytics