Stability improvement

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

Created by: yglukhov

This is a follow-up to 7601. I'm not sure if there's a possibility of such case, but anyway...

合并请求报告