do not take first digit of project id
Merge branch 'hotfix_allsets'