Merge "Bug 806, System test exception handled!"