Fixed child waiting on restore
added generic wait wrapper
3 files changed