[#69093684]pull request fixes