PR #7183

PR #7183 is not in the merge queue.