[SM-3378] This closes #8