PR #2258

PR #2258 is not in the merge queue.