addition to #10522