PR #2812

PR #2812 is not in the merge queue.