continue improve idpmatrix gen
idpmatrix cleaning
Merge branch 'develop' into 1.x-stable