Merge "Avoid hardcoded path for BACKUPDIR var"