SOC-3642 | Slowness in displaying Space activities
Merge commit '8378a218abccb7f72f6d597e911a630429f29882' into HEAD