Final patch for issue 9807.
7 files changed