addresses #9710