PR #2187

PR #2187 is not in the merge queue.