PR #3061

PR #3061 is not in the merge queue.