PR #2929

PR #2929 is not in the merge queue.