Merge 3.2 fix updates and tests for issue #15906.