PR #2636

PR #2636 is not in the merge queue.