fix spp_feature
Merge branch 'spp-dev' into spp-context