(cherry picked commit from <gitee.com//opengauss/openGauss-OM/commit/24bc6ebd78619e7ca2bc4cfda2f607252202b729>
(cherry picked commit from <gitee.com//opengauss/openGauss-OM/commit/579605ec95048e7a87c3acf17a6394955f9c1787>