backport from 1.8 (rev #9891)

fixed probing mode 1 behavior