Stability improvement

王权利请求将github/fork/yglukhov/stability-fix合并到master

Created by: yglukhov

This is a copy of #7625, to be rebuilt with new CI.

合并请求报告