addresses #9990
closes #10312
addresses #10064