speedup generating idplist for DS
Merge branch 'develop' into 1.x-stable