3.12: if shortdial correction occurs, retry lookup to keep onnet if possible
Merge remote-tracking branch 'upstream/3.12' into 3.12