Merge with 3.2: closes issue #17047