[SM-3379] This closes #9