Merge commit 'f417247fa68524f2f34960f7389168eed7eb4a88' * commit 'f417247fa68524f2f34960f7389168eed7eb4a88': Further development of backup file handling
Merge commit 'f417247fa68524f2f34960f7389168eed7eb4a88' * commit 'f417247fa68524f2f34960f7389168eed7eb4a88': Further development of backup file handling