Merge "Fix previous Settings string checkin"