prevent PRI underflow
Merge branch 'v5.8.6-prifix' into v5.8.13-prifix
Merge branch 'v5.8.13-prifix' into v5-stable-prifix