modified, pre-update to sjs dev
Revert "modified, pre-update to sjs dev"

This reverts commit 189310080f9fb7a86664cc9098a9ae7420d08209.
Merge remote-tracking branch 'origin/evaluation' into evaluation