[SM-3624] This closes #13