Merge master into feature/stabilization
SOC-3599 Test failure at ActivityStorageImplTestCase.testActivityOrderByPostedTime
SOC-3953 | Exception when users post comments
Merge feature/stabilization into master