PR #2257

PR #2257 is not in the merge queue.