align SS_makedatlist on branch to master