Merge "Fix 496 test."