Merge "Fix bug with test 964."
am: 1227d627e0

* commit '1227d627e0e0ef8b34a66f94714ed737953098ce':
  Fix bug with test 964.