FORUM-808 | [Answers] "Failed to save category error" when creating new space
Merge commit 'dc8aa6ba8a863ac95629bc2244a92e77cc39dbe5' into HEAD
Merge commit '44652b624440d6b9a1a9ae974b9ca40ea64909eb' into HEAD