Merge pull request '[se] Fix bug 81358' (#2305) from fix/bug-81358 into release/v9.4.0