disable auto-ss code, whoever enabled it
Merge branch 'master' into petool