fix to child show
fix to child show
testing on show session
Merge origin/master