Merge pull request #12543 from totten/master-prevnext-probe