Reworked restore another time.
Merge branch 'test' into dev