Fixed bug
Fixed bug for children
Merge branch 'APD-214-IMR' into develop