Merge branch 'hotfix/4014'

Close #4014
non existent child route during assembly throws exception
Merge branch 'hotfix/4035' into develop

Forward port #4035