PR #2248

PR #2248 is not in the merge queue.