Bug 813123 - Removing errors while updating
Merge pull request #8375 from lodr/bug-813123-roaming-error

Bug 813123 - Removing errors while updating
Cause r+