SOC-3140 | java.lang.NullPointerException when access Spaces and Activities after migration from plf-3.5 to plf 4.0
Merge branch 'master' into feature/relooking