Changed Waiting to PendingRestart.
CR related fixes and some fixes due to manual tests.