Merge commit '816350778ad2da0024cbd5d1838ecbcea8f018be' * commit '816350778ad2da0024cbd5d1838ecbcea8f018be': Fix bug3076083 re backup setting strings
Merge commit '816350778ad2da0024cbd5d1838ecbcea8f018be' * commit '816350778ad2da0024cbd5d1838ecbcea8f018be': Fix bug3076083 re backup setting strings