Fixed data for backup creation.
Merge branch 'test' into dev