CSPACE-6272: Initial commit