PR #2618

PR #2618 is not in the merge queue.