Address #4963

Would supersede PR #4966
1 file changed