Fix marhshalling of NS and SS attribute values
Merge branch 'master' into spaceape-build