CAL-235 CAL-376 update way to find space due to changed of social
Merge remote-tracking branch 'origin/feature/relooking' into feature/relooking