Not all organization users were visible in the spaces. Should check whether chosen solution will hold since the choice was made to solve this client side (so that we do not populate the service result with duplicates), however this might change in the future.
Merge remote-tracking branch 'origin/master'