Add new method parameter maxChildren
Merge branch 'APD-795-BOZ' into develop