Merge branch 'restore-tests' into 'develop'