Added waiting for restoring.
Merge branch 'test' into dev