fixes for child details
Merge origin/master