SOC-4034 - FORUM-808 | Imporove performance for create space.
Merge commit 'a9121e9339aa3f1b93ec33052141ec277cee5596' into HEAD