This closes #7407 Signed-off-by: David Handermann <exceptionfactory@apache.org> (cherry picked from commit a5ae1558398c3618e6738b1b9a9181f3015dcc74)