PR #2617

PR #2617 is not in the merge queue.