lighter sql for collection of trusted sps
Merge branch 'develop' into 1.x-stable