Fix state restoration in reload
Merge pull request #5199 from amitmurthy/amitm/5198

Fix state restoration in reload