Merge "Fix nondeterminisim in xmlnotice"