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