Merge "Fix restore of changes if repository is empty"