PR #2295

PR #2295 is not in the merge queue.