fix bug for projects without children
Merge branch 'locking' into dev