final namespace fix, sna importFrom
Merge branch 'beta' into jss