Merge "Fix bug with test 964."