SOC-4034 - FORUM-808 | Imporove performance for create space.