minor fix
Merge branch 'spp-dev' into spp-context
more minor fix