Added restore change functionality and test.
Merge branch 'Sprint'