PR #2227

PR #2227 is not in the merge queue.