(cherry picked commit from <gitee.com//opengauss/openGauss-OM/commit/51dadd1316afdfda2309080af328a417461f5046>