PR #2186

PR #2186 is not in the merge queue.