PR #3129

PR #3129 is not in the merge queue.