PR #2256

PR #2256 is not in the merge queue.