SOC-3710 | Loop of Lazy Upgrade Activity Stream after upgrading to Platform 4.0.2
Merge commit 'b969a87fbb8bfcae7765ede4c3e0d890dfd5c09d' into HEAD