SMN-62 #resolve-issue