PR #2299

PR #2299 is not in the merge queue.