Fix #10140 Fix #12705